From 292239f05f6877d36ce373b69846aa0793284711 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 17 Mar 2014 14:53:28 +0000 Subject: [PATCH] xen: arm: add scope to dsb and dmb macros Everywhere currently passes "sy"stem, so no actual change. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/gic.c | 10 +++++----- xen/arch/arm/platforms/vexpress.c | 6 +++--- xen/arch/arm/smpboot.c | 2 +- xen/arch/arm/time.c | 2 +- xen/drivers/video/arm_hdlcd.c | 2 +- xen/include/asm-arm/arm32/flushtlb.h | 16 ++++++++-------- xen/include/asm-arm/arm32/page.h | 4 ++-- xen/include/asm-arm/arm64/page.h | 4 ++-- xen/include/asm-arm/page.h | 8 ++++---- xen/include/asm-arm/system.h | 16 ++++++++-------- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 82a1e7965b..8834154c47 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -47,7 +47,7 @@ void idle_loop(void) local_irq_disable(); if ( cpu_is_haltable(smp_processor_id()) ) { - dsb(); + dsb(sy); wfi(); } local_irq_enable(); diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 91a2982681..0095b97595 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -139,7 +139,7 @@ static void gic_irq_enable(struct irq_desc *desc) spin_lock_irqsave(&desc->lock, flags); spin_lock(&gic.lock); desc->status &= ~IRQ_DISABLED; - dsb(); + dsb(sy); /* Enable routing */ GICD[GICD_ISENABLER + irq / 32] = (1u << (irq % 32)); spin_unlock(&gic.lock); @@ -486,7 +486,7 @@ void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) cpumask_and(&online_mask, cpumask, &cpu_online_map); mask = gic_cpu_mask(&online_mask); - dsb(); + dsb(sy); GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST | (mask<action = new; - dsb(); + dsb(sy); return 0; } diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 613205637a..8e6a4eaa32 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -48,7 +48,7 @@ static inline int vexpress_ctrl_start(uint32_t *syscfg, int write, /* wait for complete flag to be set */ do { stat = syscfg[V2M_SYS_CFGSTAT/4]; - dsb(); + dsb(sy); } while ( !(stat & V2M_SYS_CFG_COMPLETE) ); /* check error status and return error flag if set */ @@ -113,10 +113,10 @@ static void vexpress_reset(void) /* switch to slow mode */ writel(0x3, sp810); - dsb(); isb(); + dsb(sy); isb(); /* writing any value to SCSYSSTAT reg will reset the system */ writel(0x1, sp810 + 4); - dsb(); isb(); + dsb(sy); isb(); iounmap(sp810); } diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index ce68d34677..7f28b68145 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -341,7 +341,7 @@ void stop_cpu(void) local_irq_disable(); cpu_is_dead = 1; /* Make sure the write happens before we sleep forever */ - dsb(); + dsb(sy); isb(); while ( 1 ) wfi(); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index ba281e9079..8dd4bea17a 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -260,7 +260,7 @@ void udelay(unsigned long usecs) s_time_t deadline = get_s_time() + 1000 * (s_time_t) usecs; while ( get_s_time() - deadline < 0 ) ; - dsb(); + dsb(sy); isb(); } diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index 647f22c1d2..e5ad18dc90 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -78,7 +78,7 @@ void (*video_puts)(const char *) = vga_noop_puts; static void hdlcd_flush(void) { - dsb(); + dsb(sy); } static int __init get_color_masks(const char* bpp, struct color_masks **masks) diff --git a/xen/include/asm-arm/arm32/flushtlb.h b/xen/include/asm-arm/arm32/flushtlb.h index 7183a073f0..bbcc82f490 100644 --- a/xen/include/asm-arm/arm32/flushtlb.h +++ b/xen/include/asm-arm/arm32/flushtlb.h @@ -4,44 +4,44 @@ /* Flush local TLBs, current VMID only */ static inline void flush_tlb_local(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALL); - dsb(); + dsb(sy); isb(); } /* Flush inner shareable TLBs, current VMID only */ static inline void flush_tlb(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLIS); - dsb(); + dsb(sy); isb(); } /* Flush local TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all_local(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLNSNH); - dsb(); + dsb(sy); isb(); } /* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLNSNHIS); - dsb(); + dsb(sy); isb(); } diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index b8221cab97..191a108ba8 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -67,13 +67,13 @@ static inline void flush_xen_data_tlb(void) static inline void flush_xen_data_tlb_range_va(unsigned long va, unsigned long size) { unsigned long end = va + size; - dsb(); /* Ensure preceding are visible */ + dsb(sy); /* Ensure preceding are visible */ while ( va < end ) { asm volatile(STORE_CP32(0, TLBIMVAH) : : "r" (va) : "memory"); va += PAGE_SIZE; } - dsb(); /* Ensure completion of the TLB flush */ + dsb(sy); /* Ensure completion of the TLB flush */ isb(); } diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 3352821403..20b4c5a941 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -60,13 +60,13 @@ static inline void flush_xen_data_tlb(void) static inline void flush_xen_data_tlb_range_va(unsigned long va, unsigned long size) { unsigned long end = va + size; - dsb(); /* Ensure preceding are visible */ + dsb(sy); /* Ensure preceding are visible */ while ( va < end ) { asm volatile("tlbi vae2, %0;" : : "r" (va>>PAGE_SHIFT) : "memory"); va += PAGE_SIZE; } - dsb(); /* Ensure completion of the TLB flush */ + dsb(sy); /* Ensure completion of the TLB flush */ isb(); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index fd2299326f..d18ec2a7f2 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -263,20 +263,20 @@ extern size_t cacheline_bytes; static inline void clean_xen_dcache_va_range(void *p, unsigned long size) { void *end; - dsb(); /* So the CPU issues all writes to the range */ + dsb(sy); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) asm volatile (__clean_xen_dcache_one(0) : : "r" (p)); - dsb(); /* So we know the flushes happen before continuing */ + dsb(sy); /* So we know the flushes happen before continuing */ } static inline void clean_and_invalidate_xen_dcache_va_range (void *p, unsigned long size) { void *end; - dsb(); /* So the CPU issues all writes to the range */ + dsb(sy); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) asm volatile (__clean_and_invalidate_xen_dcache_one(0) : : "r" (p)); - dsb(); /* So we know the flushes happen before continuing */ + dsb(sy); /* So we know the flushes happen before continuing */ } /* Macros for flushing a single small item. The predicate is always diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 89c61efd7a..e1f126a2a3 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -13,16 +13,16 @@ #define wfi() asm volatile("wfi" : : : "memory") #define isb() asm volatile("isb" : : : "memory") -#define dsb() asm volatile("dsb sy" : : : "memory") -#define dmb() asm volatile("dmb sy" : : : "memory") +#define dsb(scope) asm volatile("dsb " #scope : : : "memory") +#define dmb(scope) asm volatile("dmb " #scope : : : "memory") -#define mb() dsb() -#define rmb() dsb() -#define wmb() dsb() +#define mb() dsb(sy) +#define rmb() dsb(sy) +#define wmb() dsb(sy) -#define smp_mb() dmb() -#define smp_rmb() dmb() -#define smp_wmb() dmb() +#define smp_mb() dmb(sy) +#define smp_rmb() dmb(sy) +#define smp_wmb() dmb(sy) #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- 2.30.2